Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 00:23:17 +0000 (00:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 17 Jun 2010 00:23:17 +0000 (00:23 +0000)
commit34c43a8079a3533f6a0c9c4c66a6a9c9bd0654e9
treef7a2efb4fb1eef31f3cce0363a92b350f4f093e8
parent7805c5be6ec72b151894315f8a99567248d46050
parent38e17e6a2b2051b129ce16cdf302add2ec787fcf
Merge from mainline.